]> git.neil.brown.name Git - wiggle.git/blob - tests/simple/conflict/new2
git / wiggle.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
Wiggle 0.6 - first release
[wiggle.git] / tests / simple / conflict / new2
1 this is a file
2 with the word
3 too which is
4 misspelt
apply rejected patches and perform word-wise diffs